bitkeeper revision 1.1236.57.1 (4252553cg_fYLV1TD86ca_IbSyJ_8w)

unnecessary difference between vanilla and xen

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
index 99cba038fc0a13cc0f9acb04332997ec07e65517..771208d00c36868ed851ea86865e075a2fddf237 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
@@ -167,7 +167,7 @@ void show_regs(struct pt_regs * regs)
        if (regs->xcs & 2)
                printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
        printk(" EFLAGS: %08lx    %s  (%s)\n",
-              regs->eflags, print_tainted(),UTS_RELEASE);
+              regs->eflags, print_tainted(), system_utsname.release);
        printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
                regs->eax,regs->ebx,regs->ecx,regs->edx);
        printk("ESI: %08lx EDI: %08lx EBP: %08lx",

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
index e22c3e1932cf9b3d573344c7b5731716b15114c5..5a474646d685f8352dba0221562f93a400144183 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
@@ -194,7 +194,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
                        }
                }
                pmd_idx = 0;
-       }       
+       }
 }
 
 static inline int page_kills_ppro(unsigned long pagenr)

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
index e278d7098e12f7a5b729865c4c5ad0a3ac4fe3f4..42fde5da549119a03278c60527f815a20c4ac3ce 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
@@ -9,13 +9,12 @@
 #include <asm/io.h>            /* for phys_to_virt and page_to_pseudophys */
 
 #define pmd_populate_kernel(mm, pmd, pte) \
-       set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
+               set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
 
-#define pmd_populate(mm, pmd, pte) do {                                \
+#define pmd_populate(mm, pmd, pte)                             \
        set_pmd(pmd, __pmd(_PAGE_TABLE +                        \
                ((unsigned long long)page_to_pfn(pte) <<        \
-                       (unsigned long long) PAGE_SHIFT)));     \
-} while (0)
+                       (unsigned long long) PAGE_SHIFT)))
 /*
  * Allocate and free page tables.
  */